Auto merge of #3671 - z1mvader:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 9 Feb 2017 01:22:51 +0000 (01:22 +0000)
committerbors <bors@rust-lang.org>
Thu, 9 Feb 2017 01:22:51 +0000 (01:22 +0000)
trying to fix unimplemented flock under linux

It fixes https://github.com/rust-lang/cargo/issues/3666


Trivial merge